bitkeeper revision 1.1159.142.8 (41856f88s5u8hpX2TlCOupENnBIqig)

merge

diff --cc .rootkeys
index 0859aeaab8bcd31f012ffec546586e6736df340f,ee88c673bb539c2149227e0e301d52e78a3c64b5..93831dd4fe3eb320fd9d7eab64ec46023e57280c
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -5,10 -5,8 +5,9 @@@
  4177dbbfqsi01p2zgZa0geUOgScONw COPYING
  3eb788d6Kleck_Cut0ouGneviGzliQ Makefile
  3f5ef5a24IaQasQE2tyMxrfxskMmvw README
- 3f69d8abYB1vMyD_QVDvzxy5Zscf1A TODO
  3f9e7d53iC47UnlfORp9iC1vai6kWw docs/Makefile
  3f9e7d60PWZJeVh5xdnk0nLUdxlqEA docs/figs/xenlogo.eps
 +418273f3YZUyGIrNbERVAPFeOd9gww docs/figs/xenserver.obj
  4022a73cgxX1ryj1HgS-IwwB6NUi2A docs/misc/XenDebugger-HOWTO
  412f4bd9sm5mCQ8BkrgKcAKZGadq7Q docs/misc/blkif-drivers-explained.txt
  40d6ccbfKKBq8jE0ula4eHEzBiQuDA docs/misc/xen_config.html

diff --cc BitKeeper/etc/ignore
index 607dc5adf539cebb94479746e69480884467232f,ad49516b63740bc9e91c91a61b17cf0f5e935f08..d8bc1ae2f2acf9d1c074a2a1296b61e2c90d8052
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -13,22 -13,22 +13,52 @@@ TAG
  Twisted-1.3.0
  Twisted-1.3.0.tar.gz
  docs/*.aux
++docs/*.dvi
  docs/*.log
  docs/*.pdf
  docs/*.ps
--docs/*.dvi
  docs/*.toc
++docs/figs/xenserver.eps
  docs/html/*
++docs/interface/WARNINGS
++docs/interface/images.pl
++docs/interface/images.tex
++docs/interface/img1.png
++docs/interface/index.html
++docs/interface/interface.css
++docs/interface/interface.html
++docs/interface/labels.pl
++docs/user/WARNINGS
++docs/user/images.pl
++docs/user/images.tex
++docs/user/img1.png
++docs/user/img2.png
++docs/user/img3.png
++docs/user/index.html
++docs/user/internals.pl
++docs/user/labels.pl
++docs/user/user.css
++docs/user/user.html
++docs/xend/WARNINGS
++docs/xend/images.pl
++docs/xend/images.tex
++docs/xend/img1.png
++docs/xend/index.html
++docs/xend/internals.pl
++docs/xend/labels.pl
++docs/xend/xend.css
++docs/xend/xend.html
  extras/mini-os/h/hypervisor-ifs
  install
  install/*
  linux-*-xen0/*
  linux-*-xenU/*
 -pristine-*
 +linux-xen-sparse
++netbsd-*-tools
  netbsd-*-xen0
  netbsd-*-xenU
--netbsd-*-tools
  patches/*
++pristine-*
  tools/*/build/lib*/*.py
  tools/balloon/balloon
  tools/check/.*
@@@ -51,32 -50,31 +81,3 @@@ xen/tools/figlet/figle
  xen/xen
  xen/xen-syms
  xen/xen.*
--docs/interface/WARNINGS
--docs/interface/images.pl
--docs/interface/images.tex
--docs/interface/img1.png
--docs/interface/index.html
--docs/interface/interface.css
--docs/interface/interface.html
--docs/interface/labels.pl
--docs/user/WARNINGS
--docs/user/images.pl
--docs/user/images.tex
--docs/user/img1.png
--docs/user/img2.png
--docs/user/img3.png
--docs/user/index.html
--docs/user/internals.pl
--docs/user/labels.pl
--docs/user/user.css
--docs/user/user.html
--docs/xend/WARNINGS
--docs/xend/images.pl
--docs/xend/images.tex
--docs/xend/img1.png
--docs/xend/index.html
--docs/xend/internals.pl
--docs/xend/labels.pl
--docs/xend/xend.css
--docs/xend/xend.html
- docs/figs/xenserver.eps

diff --cc README
index 4f771179f15b3f2646d29e60b852169e1a60d300,b56495a69c5b0a4929627caf5ff594063540ae7c..a45e7f32136042c4b72c272ee24dacb3870a8ab4
--- 1/README
--- 2/README
+++ b/README
@@@ -8,10 -8,9 +8,9 @@@ __  __            ____    __
  ###############################
  
  University of Cambridge Computer Laboratory
 -28 October 2004
 +29 October 2004
  
- http://www.cl.cam.ac.uk/netos/xen/
 -http://www.cl.cam.ac.uk/netos/xen
 +http://www.cl.cam.ac.uk/netos/xen/
  
  About the Xen Virtual Machine Monitor
  =====================================

diff --cc linux-2.6.9-xen-sparse/arch/xen/Makefile
Simple merge